Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 26 Oct 2011 08:00:46 +0000 (01:00 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 26 Oct 2011 08:00:46 +0000 (01:00 -0700)

Trivial merge